Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Tidy up run-nowebhook recipe & make clean PHONY #1310

Merged
merged 2 commits into from
Oct 21, 2024

Conversation

grdryn
Copy link
Member

@grdryn grdryn commented Oct 20, 2024

Description

How Has This Been Tested?

I verified that the expected commands would be run as part of the run-nowebhook target:

➜ make --dry-run run-nowebhook
test -s /var/home/gryan/src/github.com/opendatahub-io/opendatahub-operator/bin/controller-gen || GOBIN=/var/home/gryan/src/github.com/opendatahub-io/opendatahub-operator/bin go install sigs.k8s.io/controller-tools/cmd/[email protected]
/var/home/gryan/src/github.com/opendatahub-io/opendatahub-operator/bin/controller-gen rbac:roleName=controller-manager-role crd:ignoreUnexportedFields=true webhook paths="./..." output:crd:artifacts:config=config/crd/bases
GOFLAGS="-mod=readonly" /var/home/gryan/src/github.com/opendatahub-io/opendatahub-operator/bin/controller-gen crd paths=/var/home/gryan/go/pkg/mod/github.com/openshift/[email protected]/route/v1/... output:crd:artifacts:config=config/crd/external
GOFLAGS="-mod=readonly" /var/home/gryan/src/github.com/opendatahub-io/opendatahub-operator/bin/controller-gen crd paths=/var/home/gryan/go/pkg/mod/github.com/openshift/[email protected]/user/v1/... output:crd:artifacts:config=config/crd/external
/var/home/gryan/src/github.com/opendatahub-io/opendatahub-operator/bin/controller-gen object:headerFile="hack/boilerplate.go.txt" paths="./..."
test -s /var/home/gryan/src/github.com/opendatahub-io/opendatahub-operator/bin/golangci-lint || { curl -sSfL 'https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh' | bash -s v1.60.2; }
go fmt ./...
/var/home/gryan/src/github.com/opendatahub-io/opendatahub-operator/bin/yq e '.linters = {"disable-all": true, "enable": ["gci"]}' .golangci.yml  > .golangci.mktmp.yml
/var/home/gryan/src/github.com/opendatahub-io/opendatahub-operator/bin/golangci-lint run --config=.golangci.mktmp.yml --fix
go vet ./...
OPERATOR_NAMESPACE=opendatahub-operator-system DEFAULT_MANIFESTS_PATH=opt/manifests go run -tags nowebhook ./main.go --log-mode=devel

Merge criteria

  • You have read the contributors guide.
  • Commit messages are meaningful - have a clear and concise summary and detailed explanation of what was changed and why.
  • Pull Request contains a description of the solution, a link to the JIRA issue, and to any dependent or related Pull Request.
  • Testing instructions have been added in the PR body (for PRs involving changes that are not immediately obvious).
  • The developer has manually tested the changes and verified that the changes work

The suggestion to tidy up the run-nowebhook recipe comes from this
conversation:
https://github.com/opendatahub-io/opendatahub-operator/pull/1304/files#r1806731373
I believe `clean` should be a PHONY target, since it doesn't create a
file called `clean`
Copy link

openshift-ci bot commented Oct 21, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: ykaliuta, zdtsw

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@grdryn
Copy link
Member Author

grdryn commented Oct 21, 2024

/test opendatahub-operator-e2e

Copy link

codecov bot commented Oct 21, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (incubation@0c16075). Learn more about missing BASE report.

Additional details and impacted files
@@              Coverage Diff              @@
##             incubation    #1310   +/-   ##
=============================================
  Coverage              ?   17.50%           
=============================================
  Files                 ?       30           
  Lines                 ?     3360           
  Branches              ?        0           
=============================================
  Hits                  ?      588           
  Misses                ?     2710           
  Partials              ?       62           

☔ View full report in Codecov by Sentry.
📢 Have feedback on the report? Share it here.

@openshift-merge-bot openshift-merge-bot bot merged commit b91bd29 into opendatahub-io:incubation Oct 21, 2024
10 checks passed
@grdryn grdryn deleted the makefile-tweak branch October 21, 2024 18:23
zdtsw pushed a commit to zdtsw-forking/rhods-operator that referenced this pull request Oct 28, 2024
* chore: Tidy run-nowebhook recipe

The suggestion to tidy up the run-nowebhook recipe comes from this
conversation:
https://github.com/opendatahub-io/opendatahub-operator/pull/1304/files#r1806731373

* chore: Make `clean` a PHONY target

I believe `clean` should be a PHONY target, since it doesn't create a
file called `clean`

(cherry picked from commit b91bd29)
openshift-merge-bot bot pushed a commit that referenced this pull request Nov 4, 2024
…m incubation (#1309)

* Init: import rhoai 2.15

Signed-off-by: Wen Zhou <[email protected]>

* update: fix difference from previous commit

Signed-off-by: Wen Zhou <[email protected]>

* update: docs

Signed-off-by: Wen Zhou <[email protected]>

* remove: konflux

Signed-off-by: Wen Zhou <[email protected]>

* fix: docs and wrong selector on service

Signed-off-by: Wen Zhou <[email protected]>

* update: make TrustyAI GA

Signed-off-by: Wen Zhou <[email protected]>

* fix: syntax and missing placeholder file and channel

Signed-off-by: Wen Zhou <[email protected]>

* secret-generator controller: avoid reporting 'Secret not found' error in reconcile (#1312)

(cherry picked from commit bde4b4e)

* update: remove dsp with v1(tekton)backend related code (#1281)

* update: remove dsp with v1(tekton)backend related code

- images
- tekton rbac
- descriptions

Signed-off-by: Wen Zhou <[email protected]>
Co-authored-by: Humair Khan <[email protected]>

---------

Signed-off-by: Wen Zhou <[email protected]>
Co-authored-by: Humair Khan <[email protected]>
(cherry picked from commit 133b710)

* update: remove two SA which does not seem valid (#1254)

Signed-off-by: Wen Zhou <[email protected]>
(cherry picked from commit c0e0709)

* update: rename variables rhods to rhoai (#1313)

Signed-off-by: Wen Zhou <[email protected]>
Co-authored-by: ajaypratap003 <[email protected]>
(cherry picked from commit 511977e)

* Tidy up run-nowebhook recipe & make clean PHONY (#1310)

* chore: Tidy run-nowebhook recipe

The suggestion to tidy up the run-nowebhook recipe comes from this
conversation:
https://github.com/opendatahub-io/opendatahub-operator/pull/1304/files#r1806731373

* chore: Make `clean` a PHONY target

I believe `clean` should be a PHONY target, since it doesn't create a
file called `clean`

(cherry picked from commit b91bd29)

* chore: uplift to 2.16 and fix lint

Signed-off-by: Wen Zhou <[email protected]>

* fix: wrong type (#1322)

-  we should watch IngressController from operator.openshift.io, not the k8s ingress
-  this matched the cache we added in main

Signed-off-by: Wen Zhou <[email protected]>
(cherry picked from commit 8ea9ea0)

* update golangci-lint to v1.61.0 (#1327)

* chore(linter): update golangci-lint to v1.61.0

* chore(linter): fix findings

(cherry picked from commit 87c87ab)

* fix: name in CSV + serviceaccountt + role/binding name

Signed-off-by: Wen Zhou <[email protected]>

* chore: remove duplicated image in modelmesh (#1336)

- this only apply for deplenet odh-model-controller
- no need to set it in the default map, a waste

Signed-off-by: Wen Zhou <[email protected]>
(cherry picked from commit 1f5af72)

* feat: add annoation for cnf cni and csi

Signed-off-by: Wen Zhou <[email protected]>

* update: test and manifests for webhook mostly

Signed-off-by: Wen Zhou <[email protected]>

* add: missing mentric service

Signed-off-by: Wen Zhou <[email protected]>

---------

Signed-off-by: Wen Zhou <[email protected]>
Co-authored-by: Marek Laššák <[email protected]>
Co-authored-by: Gerard Ryan <[email protected]>
Co-authored-by: Luca Burgazzoli <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
Status: Done
Development

Successfully merging this pull request may close these issues.

3 participants